From 0e9b9e32db5a4525bb97b3ddb1e7d96a0a60139a Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Sat, 23 Jan 1999 18:44:36 +0000 Subject: [PATCH] Don't search selection list twice. (real_select_row): Remove extra ';', Sat Jan 23 13:41:00 1999 Jeff Garzik * gtk/gtkctree.c (tree_delete): Don't search selection list twice. (real_select_row): Remove extra ';', add default for clarity. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkctree.c | 9 +++++++-- 8 files changed, 49 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a297ab519..108535fc00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jan 23 13:41:00 1999 Jeff Garzik + + * gtk/gtkctree.c + (tree_delete): Don't search selection list twice. + (real_select_row): Remove extra ';', add default for clarity. + Sat Jan 23 01:44:43 1999 Lars Hamann * gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int) diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5a297ab519..108535fc00 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Sat Jan 23 13:41:00 1999 Jeff Garzik + + * gtk/gtkctree.c + (tree_delete): Don't search selection list twice. + (real_select_row): Remove extra ';', add default for clarity. + Sat Jan 23 01:44:43 1999 Lars Hamann * gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5a297ab519..108535fc00 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Jan 23 13:41:00 1999 Jeff Garzik + + * gtk/gtkctree.c + (tree_delete): Don't search selection list twice. + (real_select_row): Remove extra ';', add default for clarity. + Sat Jan 23 01:44:43 1999 Lars Hamann * gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5a297ab519..108535fc00 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sat Jan 23 13:41:00 1999 Jeff Garzik + + * gtk/gtkctree.c + (tree_delete): Don't search selection list twice. + (real_select_row): Remove extra ';', add default for clarity. + Sat Jan 23 01:44:43 1999 Lars Hamann * gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5a297ab519..108535fc00 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Jan 23 13:41:00 1999 Jeff Garzik + + * gtk/gtkctree.c + (tree_delete): Don't search selection list twice. + (real_select_row): Remove extra ';', add default for clarity. + Sat Jan 23 01:44:43 1999 Lars Hamann * gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5a297ab519..108535fc00 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Jan 23 13:41:00 1999 Jeff Garzik + + * gtk/gtkctree.c + (tree_delete): Don't search selection list twice. + (real_select_row): Remove extra ';', add default for clarity. + Sat Jan 23 01:44:43 1999 Lars Hamann * gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5a297ab519..108535fc00 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Jan 23 13:41:00 1999 Jeff Garzik + + * gtk/gtkctree.c + (tree_delete): Don't search selection list twice. + (real_select_row): Remove extra ';', add default for clarity. + Sat Jan 23 01:44:43 1999 Lars Hamann * gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int) diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c index 13b575d9e1..9b855a6079 100644 --- a/gtk/gtkctree.c +++ b/gtk/gtkctree.c @@ -3069,7 +3069,8 @@ tree_delete (GtkCTree *ctree, { if (clist->selection_end && clist->selection_end == work) clist->selection_end = clist->selection_end->prev; - clist->selection = g_list_remove (clist->selection, node); + clist->selection = g_list_remove_link (clist->selection, work); + g_list_free_1 (work); } } @@ -3425,7 +3426,11 @@ real_select_all (GtkCList *clist) case GTK_SELECTION_MULTIPLE: gtk_ctree_select_recursive (ctree, NULL); - break;; + break; + + default: + /* do nothing */ + break; } } -- 2.30.2